Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #5201 Relicense under the Apache 2.0 and add header to source files #5783

Closed
wants to merge 9 commits into from
Closed

Closes #5201 Relicense under the Apache 2.0 and add header to source files #5783

wants to merge 9 commits into from

Conversation

Fnux
Copy link
Contributor

@Fnux Fnux commented Jan 23, 2019

This PR addresses issue #5201 by relicensing the project to Apache 2.0 and adding the following license header to every scala source file:

/*
 * Dotty (https://dotty.epfl.ch/)
 *
 * Copyright EPFL.
 *
 * Licensed under Apache License 2.0
 * (https://www.apache.org/licenses/LICENSE-2.0).
 */

I didn't use the default license header for Apache 2.0 as both scala and scala-js already use a condensed version.

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello, and thank you for opening this PR! 🎉

All contributors have signed the CLA, thank you! ❤️

Have an awesome day! ☀️

Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Copyright EPFL.

I think we should do Copyright EPFL and Lightbend, Inc. like scala/scala, if only because some of our source code comes from scala/scala.

@SethTisue
Copy link
Member

SethTisue commented Jan 24, 2019

@dwijnand there's supposed to be a NOTICE file too, right?

e.g. https://github.com/scala/scala/blob/2.13.x/NOTICE

@dwijnand
Copy link
Member

Correct, http://www.apache.org/dev/apply-license.html#new:

a correct NOTICE file MUST be included in the same directory as the LICENSE file

I'd recommend:

Dotty
Copyright EPFL and Lightbend, Inc.
License: http://www.apache.org/licenses/LICENSE-2.0

@Fnux
Copy link
Contributor Author

Fnux commented Jan 24, 2019

Here is an updated header, following scala/scala's example:

/*
 * Dotty (https://dotty.epfl.ch)
 *
 * Copyright EPFL and Lightbend, Inc.
 *
 * Licensed under Apache License 2.0
 * (http://www.apache.org/licenses/LICENSE-2.0).
 *
 * See the NOTICE file distributed with this work for
 * additional information regarding copyright ownership.
 */

I'd recommend:

Dotty
Copyright EPFL and Lightbend, Inc.
License: http://www.apache.org/licenses/LICENSE-2.0

For the NOTICE file, don't we have to:

  • explicitly mention that parts of sources come from scala/scala?
  • mention vscode-dotty and and the javascript libraries living under doc-tool/resources/js/ ?

@smarter
Copy link
Member

smarter commented Jan 24, 2019

For the NOTICE file, don't we have to: [...]

Yes, I think so. So far we've used https://github.com/lampepfl/dotty/blob/master/AUTHORS.md for this.

@smarter
Copy link
Member

smarter commented Jan 25, 2019

The license field in https://github.com/lampepfl/dotty/blob/master/vscode-dotty/package.json will also need to be updated.

NOTICE Outdated Show resolved Hide resolved
LICENSE Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@OlivierBlanvillain
Copy link
Contributor

Can we avoid adding the header to every file?

@smarter
Copy link
Member

smarter commented Mar 1, 2019

Unclear, but at this point scala/scala has already added the header everywhere so to be consistent we need to do the same anyway.

@dwijnand
Copy link
Member

dwijnand commented Mar 1, 2019

Each original source document (code and documentation, but excluding the LICENSE and NOTICE files) SHOULD include a short license header at the top. If the distribution contains documents not covered by CLA, CCLA or Software Grant (such as third-party libraries) then see the policy guide.

@OlivierBlanvillain
Copy link
Contributor

SHOULD

So I guess we could also we just write "Unless stated otherwise, every .scala file in this repository is distributed under the Apache License 2.0." or something. I find it crazy that we can use all these elaborate programming abstractions but we have to copy paste a bunch a boilerplate everywhere for licencing...

@nafg
Copy link

nafg commented Mar 1, 2019 via email

@smarter
Copy link
Member

smarter commented Mar 1, 2019

That plugin is in fact used in this PR :).

@nafg
Copy link

nafg commented Mar 1, 2019

Sorry. Then I didn't understand @OlivierBlanvillain's comment.

@OlivierBlanvillain
Copy link
Contributor

I'm not concerned about maintenance, what bothers me is having 10 useless lines at the beginning of every single file. Maybe I need an ad blocker in my text editor or something 😋

@dwijnand
Copy link
Member

dwijnand commented Mar 1, 2019

IANAL etc, but I think it would be equally valid (and much shorter) for the header to be

// Copyright 2012-2019 EPFL
// Copyright 2012-2019 Lightbend, Inc.
// Licence: Apache-2.0

@nafg
Copy link

nafg commented Mar 3, 2019 via email

@SethTisue
Copy link
Member

but I think it would be equally valid (and much shorter) for the header to be

previous round of bikeshedding on this at
scala/scala#7306 (comment)

@Fnux
Copy link
Contributor Author

Fnux commented Jul 11, 2019

We have to agree on something if we don't want this PR to rot forever. Do we want to merge the current state or reduce the size of the header first?

@smarter
Copy link
Member

smarter commented Jul 11, 2019

We should do exactly what Scala 2 does so keep the current header, anything else will make code sharing harder for no good reason.

@SethTisue
Copy link
Member

May I suggest that it's time to revive or replace this PR? The core of it — replacing BSD license with Apache license — seems crucially important to me.

@smarter
Copy link
Member

smarter commented Jan 17, 2020

Feel free to open a new updated pr.

@SethTisue
Copy link
Member

more minimal PR that doesn't do anything with the headers: #8026

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants